7789f9adbd88dad9965a317446d330b3f568bff7,refactoring/impl/com/intellij/refactoring/rename/naming/AutomaticVariableRenamer.java,AutomaticVariableRenamer,nameToCanonicalName,#String#PsiNamedElement#,40

Before Change



  public String nameToCanonicalName(String name, PsiNamedElement psiVariable) {
    final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(psiVariable.getManager());
    return codeStyleManager.variableNameToPropertyName(name, codeStyleManager.getVariableKind((PsiVariable)psiVariable));
  }

  public String canonicalNameToName(String canonicalName, PsiNamedElement psiVariable) {

After Change



  public String nameToCanonicalName(String name, PsiNamedElement psiVariable) {
    final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(psiVariable.getManager());
    final String propertyName = codeStyleManager.variableNameToPropertyName(name, codeStyleManager.getVariableKind((PsiVariable)psiVariable));
    if (myToUnpluralize.contains(psiVariable)) return StringUtil.unpluralize(propertyName);
    return propertyName;
  }